tests: Adjust test runner

The script currently assumes that srcdir is relative to builddir,
which is not the case for build directories outside the source tree
like the one used by jhbuild.
While we could get fancy and prepend the builddir if srcdir is relative,
there's nothing wrong with a relative path as we cd into the builddir
before evaluating srcdir.

https://bugzilla.gnome.org/show_bug.cgi?id=783206

diff --git a/tests/run-test.sh.in b/tests/run-test.sh.in
index d8f5a9bbe6f88d1903b19a1e402c049b20e49652..f55d96656f2f1189846babf1d16f8919f6ecb464 100755 (executable)
--- a/tests/run-test.sh.in
+++ b/tests/run-test.sh.in
@@ -27,11 +27,11 @@ done
 
 builddir=`dirname $0`
 builddir=`cd $builddir && pwd`
-srcdir=$builddir/@srcdir@
+srcdir=@srcdir@
 srcdir=`cd $srcdir && pwd`
 
 GI_TYPELIB_PATH="$GI_TYPELIB_PATH${GI_TYPELIB_PATH:+:}@MUTTER_TYPELIB_DIR@:$builddir/../src:$builddir/../src/gvc"
-GJS_PATH="$srcdir:$srcdir/../js"
+GJS_PATH="$srcdir:$srcdir/../js:$builddir/../js"
 GJS_DEBUG_OUTPUT=stderr
 $verbose || GJS_DEBUG_TOPICS="JS ERROR;JS LOG"
 GNOME_SHELL_TESTSDIR="$srcdir/"